From 04719d2b1ea22735b99fed3bce8f6db232011274 Mon Sep 17 00:00:00 2001 From: Andreas Beckmann Date: Wed, 29 Jul 2020 11:52:56 +0100 Subject: [PATCH] clang-9 has libclang-cpp, too Gbp-Pq: Name libclang-cpp.patch --- cmake/LLVM.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/LLVM.cmake b/cmake/LLVM.cmake index 33c4575..fb7ddd4 100644 --- a/cmake/LLVM.cmake +++ b/cmake/LLVM.cmake @@ -219,7 +219,7 @@ string(REPLACE " -pedantic" "" LLVM_CXXFLAGS "${LLVM_CXXFLAGS}") string(REGEX REPLACE "-W[^ ]*" "" LLVM_CXXFLAGS "${LLVM_CXXFLAGS}") # Llvm-config does not include clang libs -if((9 LESS LLVM_MAJOR) AND (LLVM_LIB_IS_SHARED MATCHES "shared")) +if((8 LESS LLVM_MAJOR) AND (LLVM_LIB_IS_SHARED MATCHES "shared")) # Link against a single shared library instead of multiple component shared # libraries. set(CLANG_LIBNAMES clang-cpp) @@ -233,7 +233,7 @@ endif() foreach(LIBNAME ${CLANG_LIBNAMES}) find_library(C_LIBFILE_${LIBNAME} NAMES "${LIBNAME}" HINTS "${LLVM_LIBDIR}") list(APPEND CLANG_LIBFILES "${C_LIBFILE_${LIBNAME}}") - if(UNIX AND (NOT APPLE)) + if(UNIX AND (NOT APPLE) AND (NOT ((8 LESS LLVM_MAJOR) AND (LLVM_LIB_IS_SHARED MATCHES "shared")))) set(LLVM_LDFLAGS "${LLVM_LDFLAGS} -Wl,--exclude-libs,lib${LIBNAME}") endif() endforeach() -- 2.30.2